Set up two more jobs to handle staging and production cases for automerge workflow #1802
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Don't merge, looks like my logic for branches-ignore is wrong. |
AndrewGable
changed the title
AndrewGable
changed the title
|
Ok ready for review |
roryabraham
requested changes
Mar 16, 2021
.github/workflows/preDeploy.yml
Outdated
| if: | | ||
| ${{ needs.chooseDeployActions.outputs.isStagingDeployLocked == 'true' }} && | ||
| ${{ needs.chooseDeployActions.outputs.isVersionBumpPR == 'false' }} | ||
| if: ${{ needs.chooseDeployActions.outputs.isStagingDeployLocked == 'true' }} && ${{ needs.chooseDeployActions.outputs.isVersionBumpPR == 'false' }} |
There was a problem hiding this comment.
I think we need this to be like this:
Suggested change
| if: ${{ needs.chooseDeployActions.outputs.isStagingDeployLocked == 'true' }} && ${{ needs.chooseDeployActions.outputs.isVersionBumpPR == 'false' }} | |
| if: ${{ needs.chooseDeployActions.outputs.isStagingDeployLocked == 'true' && needs.chooseDeployActions.outputs.isVersionBumpPR == 'false' }} |
.github/workflows/preDeploy.yml
Outdated
| if: | | ||
| ${{ needs.chooseDeployActions.outputs.isVersionBumpPR == 'true' }} && | ||
| ${{ needs.chooseDeployActions.outputs.isStagingDeployLocked == 'false' }} | ||
| if: ${{ needs.chooseDeployActions.outputs.isVersionBumpPR == 'true' }} && ${{ needs.chooseDeployActions.outputs.isStagingDeployLocked == 'false' }} |
There was a problem hiding this comment.
Suggested change
| if: ${{ needs.chooseDeployActions.outputs.isVersionBumpPR == 'true' }} && ${{ needs.chooseDeployActions.outputs.isStagingDeployLocked == 'false' }} | |
| if: ${{ needs.chooseDeployActions.outputs.isVersionBumpPR == 'true' && needs.chooseDeployActions.outputs.isStagingDeployLocked == 'false' }} |
.github/workflows/preDeploy.yml
Outdated
| @@ -153,6 +149,10 @@ jobs: | |||
| - name: Checkout master branch | |||
| run: git checkout master | |||
|
|
|||
| - name: Set Staging Version | |||
| run: | | |||
There was a problem hiding this comment.
NAB no need for the | here AFAIK
|
@roryabraham looks like this was merged without passing tests. Please add a note explaining why this was done or remove the |
|
Merging to un-break deploys |
|
I believe this PR causes duplicate CLA actions to run on pull requests:
|
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Details
This PR does two things:
OSBotifymaster, only merge if only those specific files are changed, and none are added or deletedstaging, only merge if the PR head branch ismasterproduction, only merge if the PR head branch isstagingFixed Issues
Fixes deploys from not running
Tests
Merge this PR and verify that a staging PR is created and merged automatically